merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Wed, 1 Aug 2007 22:40:30 +0000 (16:40 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 1 Aug 2007 22:40:30 +0000 (16:40 -0600)

Trivial merge